From 67e3121dec5e404db176ec1bf7a1245041ff292e Mon Sep 17 00:00:00 2001 From: Daniel Elstner Date: Sat, 9 Feb 2002 19:14:54 +0000 Subject: [PATCH] Add missing curled braces so that it doesn't always return. Also indent 2002-02-09 Daniel Elstner * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing curled braces so that it doesn't always return. Also indent both CHECK_IN_BUFFER* macros properly, and make use of G_STMT_START/G_STMT_END. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtktextchild.c | 18 ++++++++++++++++-- 8 files changed, 65 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fdf2ff2e26..50f17b60a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-02-09 Daniel Elstner + + * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing + curled braces so that it doesn't always return. Also indent + both CHECK_IN_BUFFER* macros properly, and make use of + G_STMT_START/G_STMT_END. + Sat Feb 9 13:27:14 2002 Owen Taylor * gtk/gtkbindings.h: Add prototype for diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fdf2ff2e26..50f17b60a7 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2002-02-09 Daniel Elstner + + * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing + curled braces so that it doesn't always return. Also indent + both CHECK_IN_BUFFER* macros properly, and make use of + G_STMT_START/G_STMT_END. + Sat Feb 9 13:27:14 2002 Owen Taylor * gtk/gtkbindings.h: Add prototype for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fdf2ff2e26..50f17b60a7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2002-02-09 Daniel Elstner + + * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing + curled braces so that it doesn't always return. Also indent + both CHECK_IN_BUFFER* macros properly, and make use of + G_STMT_START/G_STMT_END. + Sat Feb 9 13:27:14 2002 Owen Taylor * gtk/gtkbindings.h: Add prototype for diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fdf2ff2e26..50f17b60a7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2002-02-09 Daniel Elstner + + * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing + curled braces so that it doesn't always return. Also indent + both CHECK_IN_BUFFER* macros properly, and make use of + G_STMT_START/G_STMT_END. + Sat Feb 9 13:27:14 2002 Owen Taylor * gtk/gtkbindings.h: Add prototype for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fdf2ff2e26..50f17b60a7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2002-02-09 Daniel Elstner + + * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing + curled braces so that it doesn't always return. Also indent + both CHECK_IN_BUFFER* macros properly, and make use of + G_STMT_START/G_STMT_END. + Sat Feb 9 13:27:14 2002 Owen Taylor * gtk/gtkbindings.h: Add prototype for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fdf2ff2e26..50f17b60a7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2002-02-09 Daniel Elstner + + * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing + curled braces so that it doesn't always return. Also indent + both CHECK_IN_BUFFER* macros properly, and make use of + G_STMT_START/G_STMT_END. + Sat Feb 9 13:27:14 2002 Owen Taylor * gtk/gtkbindings.h: Add prototype for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fdf2ff2e26..50f17b60a7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2002-02-09 Daniel Elstner + + * gtk/gtktextchild.c (CHECK_IN_BUFFER_RETURN): Add missing + curled braces so that it doesn't always return. Also indent + both CHECK_IN_BUFFER* macros properly, and make use of + G_STMT_START/G_STMT_END. + Sat Feb 9 13:27:14 2002 Owen Taylor * gtk/gtkbindings.h: Add prototype for diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c index 7b00005b90..716132bd75 100644 --- a/gtk/gtktextchild.c +++ b/gtk/gtktextchild.c @@ -52,8 +52,22 @@ #include "gtktextbtree.h" #include "gtktextlayout.h" -#define CHECK_IN_BUFFER(anchor) do { if ((anchor)->segment == NULL) g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); } while (0) -#define CHECK_IN_BUFFER_RETURN(anchor, val) do { if ((anchor)->segment == NULL) g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); return (val); } while (0) +#define CHECK_IN_BUFFER(anchor) \ + G_STMT_START { \ + if ((anchor)->segment == NULL) \ + { \ + g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); \ + } \ + } G_STMT_END + +#define CHECK_IN_BUFFER_RETURN(anchor, val) \ + G_STMT_START { \ + if ((anchor)->segment == NULL) \ + { \ + g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", G_GNUC_FUNCTION); \ + return (val); \ + } \ + } G_STMT_END static GtkTextLineSegment * pixbuf_segment_cleanup_func (GtkTextLineSegment *seg, -- 2.30.2